Merge branch 'stable-2.5' * stable-2.5: Fix clone from multi_ack_detailed clients Change-Id: I7c5db9f3913dfa34b78f9a8d0f4d8aee9d921f96